Merged.
authoremellor@ewan <emellor@ewan>
Tue, 4 Oct 2005 10:15:34 +0000 (11:15 +0100)
committeremellor@ewan <emellor@ewan>
Tue, 4 Oct 2005 10:15:34 +0000 (11:15 +0100)

Trivial merge